Remove test_ prefix from functions that are scoped by a test module anyway
Add integration tests