re-added unit test runner
fixed integration test