update tests and ensure they pass