Fixes more CodePro violations and adds more tests for Alpha Hanto