modification on BlockHandlerLocalTest and WorkerStorageTest
Refactor and code clean