Fixed tests for new layout