Improvements in inspection + unit tests.