reordered fields and made internal handlers 'transient' in their lifestyle
increased timeout in long-running test