master: Refactored test
master: Moving towards repository and JPA
master: Missde these files
master: And..