TaskQueue test coverage improved + Bugfixes