Removing test- Mocking framework doesn't work well with these interfaces