Added more tests
added integration tests