updating tests and such, testing