Made tests use layout