Cleaning up tests and adding to order negative tests

Change-Id: I8825ea00f3b4c1f5ac80a7c577e06adb62048cdd