Refactored and Re-added tests, all is well.