Additional validations; removed need for sinon