Removing unnecessary flag setting
Unit test updates
Removed unnecessary dot filter iterator
Updates