fix integration tests, cleanup
add the test directory