enhanced tests and spoon integation