test: improve existing tests
test: add more integration tests