add Target class & tests