Improve unit test infrastructure 	nd add second test suite