converted to grunt for test runner
moved some test around