Updated tests for new layout