cleanup bugs, mismatches test ok after changes to PowerCalculator