Refactored the test initialization to remove dependency on the unit test execution order. JUnit does not guarantee a certain test order.
Merge origin/master