Add integration tests 
fix constructs broken during refactor