Added additional integration tests and fixed some minor bugs.