update tests and such