* Test harness fixes and integration test refactor and addition. * Clean up. * Address review comments. * Improve method names.