More tests, more overloading