CARE #85: Added some tests