refactored a few tests