Fix attribute calculator test cases