Restore supertab. Added macros for annotating tests and creating public methods