Cleaned House. Tests all pass at this point in time.