remove old function signature
more time parsing testing
remove debug statements
add some query tests