making integration test a real integration test
cleaning up resolved todos