clean up test code - implement new methods in our fake classes
minor - remove debug message and add comment to performDrop debug message
attempt to improve substituteAlias() matching without changing the result if we don't get a match (not yet working)