Fixes old notes on pull request and changed names
Fixes tests
Fixes style offenses