-add integration tests + minor changes