Order validations and spec tests added