add integration tests
fix tests
add integration tests + using proxy instead of alter
add integration tests