added 'req ClassName' template-expand
added swap-impl-test