adjusted tests due to previous round of changes