Increased code coverage. Fixed widget restriction bug.