Update entities an repos. Work on Unit tests