Progress on running in separate thread
Got tests working by changing them or commenting out