Issue 77: Unit test order issue