Added integration test, Closes #2