Add tests
Reorder tests
Minor fixes to tests
Merge pull request #4 from pasiaj/master

Add tests