fix test coverage for w\s\query\select
more unit tests
add more unit tests