JBTM-1412 refactorred setup/teardown
JBTM-1412 Updated to allow the server a little longer to recover for limited devices