#199 - started adding some integration tests