Updated unit tests and test harness