Integration tests working

Next up: cleanup