rewrite test to match new layout