Move some test helpers to separate file
Basic decorators/cm skeleton