fix tests to reflect changes