Improved test harness, added a few more test requests