fixes for api1
moved to set api
passing 27 scenarios in vscan_test
Fixed some failing tests