Test Harness and model changes

Fleshed out testing mechanisms for algorithm, changed some models in
minor ways (renaming, default values)