Fixed testbreak on windows
Added jsr305 annotations
Fixed annotation