added back some tests