Removing unused test file
Made a few changes. Still lots more to do.
More updates to queries.