Issue #148: SetterGetterTestBase changed and 2 types detected with wrong returns, fixed them