moved all tests to a single test dir
re-added functional and integration tests
fixed bin/test for new test directories