Re-enable some previously failing tests and expectations