adds some tests for current and future shortname matches