updated test fixtures and expectations