Adding integration test, need to work on it