Work on integration tests (all pass! <3)