more test cases for canonical queries and makefile typo fixes