Rename test modules
Changes for Esquire 1.1.1.