fix for scrutinizer issue and refine tests