Changed to associativity, changed tests