Updated tests
Merge pull request #3 from mkuzio/layout

Updated tests