update tests, modified functions