removed tests from scrutinizer, fixed(?) optional params