Update to test - add join to threads