Fix TestNG compatibility issues. Separate unit and integration tests.