* Update tests
* Remove blank line before return in methods with 2 lines