Updated unit tests and scrutinizer