Fixes for code inspection tests