Make appropriate methods static, and test.