Test Refactor, consolidate Evaluate Add tests