Cleaned up tests and refactored and who really cares at this point?