Refactored Tests into two classes to match what they test better.