fixes to tests after code changes