Changed to single thread
Updated test to changes