made tests less redundant and got them to pass
Merge pull request #4 from FlackAP/layout

made tests less redundant and got them to pass