update tests, other minor