Some reordering.
Update tests to reflect NexusTimer refactor.