updating tests and methods