Fixed tests to reflect our layout