put in write locks in Storage, reduce default number of tests