Update #283 - Add some more test cases when triggering manual SQL queries