Re-order method declarations based on the orders they are called.
Add try-catch statements to unit tests to fail the test when exceptions are thrown.