WIP - integration tests

YOU DEFINITELY NEED TO ADD THESE TESTS.