Fixed halting errors when ServerObject fails, cleanup on Update test