- cleanup [#49925483]
-rm comment chars
-add Mockito