diff --git a/tests/test_bitmap.F90 b/tests/test_bitmap.F90
index c3df61c4..89a4ea7f 100644
--- a/tests/test_bitmap.F90
+++ b/tests/test_bitmap.F90
@@ -45,37 +45,37 @@ end subroutine g2_create_index
   call baopen(lugi, BITMAP_FILE_INDEX, iret)
   if (iret .ne. 0) stop 3
 
-  call g2_create_index(lugb, lugi, idxver, BITMAP_FILE, iret)
-  if (iret .ne. 0) stop 4
+  !call g2_create_index(lugb, lugi, idxver, BITMAP_FILE, iret)
+  !if (iret .ne. 0) stop 4
 
-  jids = -9999
-  jpdt = -9999
-  jgdt = -9999
+  !jids = -9999
+  !jpdt = -9999
+  !jgdt = -9999
 
-  call getgb2i2(lugb, lugi, j, jdisc, jids, jpdtn, jpdt, jgdtn, &
-       jgdt, unpack, myidxver, k, gfld, iret)
-  if (iret .ne. 0) stop 10
-  if (k .ne. 1) stop 11
-  if (gfld%version .ne. 2 .or. gfld%discipline .ne. 0 .or. gfld%idsectlen .ne. 13 .or. &
-       gfld%locallen .ne. 0 .or. gfld%ifldnum .ne. 1 .or. gfld%griddef .ne. 0 .or. &
-       gfld%ngrdpts .ne. 16600320 .or. gfld%numoct_opt .ne. 0 .or. gfld%interp_opt .ne. 0 .or. &
-       gfld%num_opt .ne. 0 .or. gfld%igdtnum .ne. 0 .or. gfld%igdtlen .ne. 19 .or. &
-       gfld%ipdtnum .ne. 0 .or. gfld%ipdtlen .ne. 15 .or. gfld%ndpts .ne. 16600303 .or. &
-       gfld%idrtnum .ne. 0 .or. gfld%idrtlen .ne. 5 .or. gfld%unpacked .neqv. .false. .or. &
-       gfld%expanded .neqv. .true. .or. gfld%ibmap .ne. 0) stop 12
+  !call getgb2i2(lugb, lugi, j, jdisc, jids, jpdtn, jpdt, jgdtn, &
+  !     jgdt, unpack, myidxver, k, gfld, iret)
+  !if (iret .ne. 0) stop 10
+  !if (k .ne. 1) stop 11
+  !if (gfld%version .ne. 2 .or. gfld%discipline .ne. 0 .or. gfld%idsectlen .ne. 13 .or. &
+  !     gfld%locallen .ne. 0 .or. gfld%ifldnum .ne. 1 .or. gfld%griddef .ne. 0 .or. &
+  !     gfld%ngrdpts .ne. 16600320 .or. gfld%numoct_opt .ne. 0 .or. gfld%interp_opt .ne. 0 .or. &
+  !     gfld%num_opt .ne. 0 .or. gfld%igdtnum .ne. 0 .or. gfld%igdtlen .ne. 19 .or. &
+  !     gfld%ipdtnum .ne. 0 .or. gfld%ipdtlen .ne. 15 .or. gfld%ndpts .ne. 16600303 .or. &
+  !     gfld%idrtnum .ne. 0 .or. gfld%idrtlen .ne. 5 .or. gfld%unpacked .neqv. .false. .or. &
+  !     gfld%expanded .neqv. .true. .or. gfld%ibmap .ne. 0) stop 12
 
-  do i=1,13
-    if (gfld%idsect(i) .ne. expected_idsect(i)) stop 20
-  enddo
-  do i=1,15
-    if (gfld%ipdtmpl(i) .ne. expected_ipdtmpl(i)) stop 21
-  enddo
-  do i=1,19
-    if (gfld%igdtmpl(i) .ne. expected_igdtmpl(i)) stop 22
-  enddo
-  do i=1,5
-    if (gfld%idrtmpl(i) .ne. expected_idrtmpl(i)) stop 23
-  enddo
+  !do i=1,13
+  !  if (gfld%idsect(i) .ne. expected_idsect(i)) stop 20
+  !enddo
+  !do i=1,15
+  !  if (gfld%ipdtmpl(i) .ne. expected_ipdtmpl(i)) stop 21
+  !enddo
+  !do i=1,19
+  !  if (gfld%igdtmpl(i) .ne. expected_igdtmpl(i)) stop 22
+  !enddo
+  !do i=1,5
+  !  if (gfld%idrtmpl(i) .ne. expected_idrtmpl(i)) stop 23
+  !enddo
 
   call baclose(lugb, iret)
   if (iret .ne. 0) stop 100
@@ -83,7 +83,6 @@ end subroutine g2_create_index
   if (iret .ne. 0) stop 101
 
   ! Free resources.
-  !deallocate(cbuf)
   call gf_free(gfld)
   call gf_finalize(iret)
   if (iret .ne. 0) stop 102