reorder tests to see if travis will run them right
diff group
try to seperate the tests more
Merge pull request #6 from sclasen/fix-travis

Fix travis