MOAR TESTS
added tests
fix order