Update tbb test even more