Add Toolbox tests.
Add modifier flags, and decouple all flag from with flag.
Clear modifiers in count methods of bean and add tests.