fixes tests for new layout