Fixed failing test that was caused as a result of a bad merge with master.