More inspectors
New tests added