remove trailing spaces
Fixing tests
@author tags