added back some tests + needed updates