[Test] Improved test harness, added more tests