Now passes JUnit test, EXP phase 1. Errors with fold / surrogate fold in
phase 2