* Initial integration test, um, test * Hack in service * Add integration test for issue #480 * Add fix for issue #418 * Add fix for issue #370