Remove injection from the repositories.
Add unit test on space implementations, and fix them.