Test refactoring
(Take two) I did not implement global values for the sleep changes as suggested but otherwise all changes suggested in previous (now closed) merge request have been seen to
(Take two) I did not implement global values for the sleep changes as suggested but otherwise all changes suggested in previous (now closed) merge request have been seen to