diff --git a/src/referencedata-facilities-cache/referencedata-facilities-cache.run.spec.js b/src/referencedata-facilities-cache/referencedata-facilities-cache.run.spec.js
index fa6cda1..f6feacf 100644
--- a/src/referencedata-facilities-cache/referencedata-facilities-cache.run.spec.js
+++ b/src/referencedata-facilities-cache/referencedata-facilities-cache.run.spec.js
@@ -39,7 +39,9 @@ describe('referencedata-facilities-cache run', function() {
         this.postLogoutAction = this.getLastCall(loginServiceSpy.registerPostLogoutAction).args[0];
 
         spyOn(this.facilityService, 'cacheAllMinimal');
+        spyOn(this.facilityService, 'getFacilitiesWithoutWards');
         spyOn(this.facilityService, 'clearMinimalFacilitiesCache');
+        spyOn(this.facilityService, 'clearFacilitiesWithoutWardsCache');
     });
 
     describe('run block', function() {
diff --git a/src/requisition-order-create/order-create-tab.jsx b/src/requisition-order-create/order-create-tab.jsx
index 2c519d6..a0077cf 100644
--- a/src/requisition-order-create/order-create-tab.jsx
+++ b/src/requisition-order-create/order-create-tab.jsx
@@ -131,7 +131,7 @@ const OrderCreateTab = ({ passedOrder,
                             validateRow={validateRow}
                             showValidationErrors={showValidationErrors}
                             isReadOnly={isTableReadOnly}
-                            pageSize={10} // TODO: remove this
+                            pageSize={6}
                         />
                     </div>
                 </div>
diff --git a/src/requisition-order-create/order-create-table.jsx b/src/requisition-order-create/order-create-table.jsx
index 64bc628..3eec563 100644
--- a/src/requisition-order-create/order-create-table.jsx
+++ b/src/requisition-order-create/order-create-table.jsx
@@ -260,7 +260,7 @@ const OrderCreateTable = ({ isReadOnly }) => {
                         <button
                             type="button"
                             className="btn primary"
-                            // disabled={createOrderDisabled(orders)}
+                            disabled={createOrderDisabled(orders)}
                             onClick={() => setIsSummaryModalOpen(true)}
                         >{formatMessage('requisition.orderCreate.create')}</button>
                     </>