updated test and scanner