Update test code for method that aren't variadic anymore
Simplify equals implementation