Be able to run test integration from any dir
Remove old query code
pep 8