(QENG-807) finish spec tests