Cleaned the tests
Remowed some unnecessary test ( for annotations, etc ..)