tests refactored to be more readebly