Ongoing bugfix for user custom test.
Merge branch 'master' of https://github.com/davemun/toy-problem-app