Cleaned up unit tests and in OrderService and Database1_9_7UpgradeTest to use junit rules instead of expected attribute of the @Test annotation