redefined tests, rewrite of methods to allow method chaining