Finish switch from @staticmethod on target methods
Add initial tests, convert use of Sample to tuples