Progress on getting test running properly