Refactor inspection specs
MOre refactoring of specs to make more readable/extensible