Added some more integration tests. Hoping Travis works.