Moved scrutiny code out of init, separate out tests