added extra types to target checker
added testing code