JSDOc and renaming
Fixed tests