Test utility.
Merge branch 'Kris_Tests' into develop