diff --git a/mps/qa/function/96.c b/mps/qa/function/96.c
index 28d8d81462d..5f1d4aa29d7 100644
--- a/mps/qa/function/96.c
+++ b/mps/qa/function/96.c
@@ -1,6 +1,6 @@
 /* 
 TEST_HEADER
- id = $HopeName: MMQA_test_function!96.c(trunk.4) $
+ id = $HopeName: MMQA_test_function!96.c(trunk.5) $
  summary = low memory tests with AMC (and using MV)
  language = c
  link = testlib.o rankfmt.o
@@ -14,18 +14,25 @@ END_HEADER
 #include "rankfmt.h"
 
 
+#define genCOUNT (3)
+
+static mps_gen_param_s testChain[genCOUNT] = {
+  { 6000, 0.90 }, { 8000, 0.65 }, { 16000, 0.50 } };
+
+
 void *stackpointer;
 
 mps_pool_t poolmv;
-mps_space_t space;
+mps_arena_t arena;
 
 
-static void fillup(void) {
+static void fillup(void)
+{
  size_t size;
  mps_addr_t a;
  char *b;
 
- mps_pool_create(&poolmv, space, mps_class_mv(), 64, 64, 64);
+ mps_pool_create(&poolmv, arena, mps_class_mv(), 64, 64, 64);
  size=1024ul*1024ul;
  while (size) {
   while (mps_alloc(&a, poolmv, size)==MPS_RES_OK) {
@@ -38,7 +45,8 @@ static void fillup(void) {
 }
 
 
-static void empty(void) {
+static void empty(void)
+{
  mps_pool_destroy(poolmv);
 }
 
@@ -50,6 +58,7 @@ static void test(void)
  mps_root_t root, root1;
 
  mps_fmt_t format;
+ mps_chain_t chain;
  mps_ap_t ap;
 
  mycell *a, *b;
@@ -58,30 +67,25 @@ static void test(void)
  int j;
 
  /* create an arena that can't grow beyond 30 M */
-
- cdie(mps_arena_create(&space, mps_arena_class_vm(), (size_t) (1024*1024*30)),
+ cdie(mps_arena_create(&arena, mps_arena_class_vm(), (size_t) (1024*1024*30)),
   "create arena");
+ die(mps_arena_commit_limit_set(arena, (size_t) (1024*1024*30)), "limit");
 
- cdie(mps_arena_commit_limit_set(space, (size_t) (1024*1024*30)), "limit");
-
- cdie(mps_thread_reg(&thread, space), "register thread");
+ die(mps_thread_reg(&thread, arena), "register thread");
 
+ die(mps_root_create_reg(&root, arena, MPS_RANK_AMBIG, 0, thread,
+                         mps_stack_scan_ambig, stackpointer, 0),
+     "create root");
+ 
  cdie(
-  mps_root_create_reg(&root, space, MPS_RANK_AMBIG, 0, thread,
-   mps_stack_scan_ambig, stackpointer, 0),
-  "create root");
-
- cdie(
-  mps_root_create_table(&root1,space,MPS_RANK_AMBIG,0,&exfmt_root,1),
+  mps_root_create_table(&root1,arena,MPS_RANK_AMBIG,0,&exfmt_root,1),
   "create table root");
 
- cdie(
-  mps_fmt_create_A(&format, space, &fmtA),
-  "create format");
+ cdie(mps_fmt_create_A(&format, arena, &fmtA), "create format");
+ cdie(mps_chain_create(&chain, arena, genCOUNT, testChain), "chain_create");
 
- cdie(
-  mps_pool_create(&pool, space, mps_class_amc(), format),
-  "create pool");
+ die(mmqa_pool_create_chain(&pool, arena, mps_class_amc(), format, chain),
+     "create pool");
 
  cdie(
   mps_ap_create(&ap, pool, MPS_RANK_EXACT),
@@ -100,13 +104,6 @@ static void test(void)
 
  comment("created 16M of live objects");
 
-
-/*
- for (j=0; j<1000; j++) {
-  res=allocrdumb(&a, ap, 1024*1024, MPS_RANK_EXACT);
- }
-*/
-
  fillup();
 
  comment("try to make collect by allocating another 1G...");
@@ -125,27 +122,18 @@ static void test(void)
  comment("collect world...");
 
  for (j=0; j<10; j++) {
-  mps_arena_collect(space);
+  mps_arena_collect(arena);
  }
 
  mps_ap_destroy(ap);
- comment("Destroyed ap.");
-
  mps_pool_destroy(pool);
- comment("Destroyed pool.");
-
+ mps_chain_destroy(chain);
  mps_fmt_destroy(format);
- comment("Destroyed format.");
-
  mps_root_destroy(root);
  mps_root_destroy(root1);
- comment("Destroyed roots.");
-
  mps_thread_dereg(thread);
- comment("Deregistered thread.");
-
- mps_space_destroy(space);
- comment("Destroyed space.");
+ mps_arena_destroy(arena);
+ comment("Destroyed arena.");
 }