fix tests nonfree
Merge branch 'master' into basil
fixed properties