scan - some tests improvements