Remove unnecessary java public keyword
Move methods
Add function tests
Rename test method