Fix namespace change (task to scheduler)
Fix tests which influenced by productive values