Simplified types used for testing. Removed unnecessary repository interface. Related pull request: #221.