Cleaned up unit tests and current repository interfaces.