fixed all the tests from making layout work