SPDIII-48: Failing specs fixed