query test cases
refactor test
strip