Updated Tests, Over Engineered