Refactored expected values to be represented using Thorax models