Updated test spec and refactored tests
Merge branch 'filling-in-layout'