Refactored tests into specific areas, and pulled out a common trait