Update schemes and tests for eps v2.5. Refs #3