added a few tests in handler and queue