Refactored to make running tests easier.