Move implementation to test file