working on getting tests passing following layout modifications - 5 tests still failing