refactored tests layout
Merge pull request #10 from tuxcanfly/master

Refactored the layout for tests