Refactored expected values to be represented using Thorax models
Code cleanup in response to pull request comments
Don't use index attribute on population, instead look at collection position
Merge branch 'refactor_expected_values' into develop; closes #13