Removing old test
Refactor Retainer to Interface & Repo. Add tests for Retainer