Removed useless @Column annotations
Cleaned code in unit tests and added mockito framework support