WIP: more tests
added more integration tests