fixed some refactored tests