Fixing most tests that I've broken, generalizing decorator for Richard
Fixing most tests that I've broken, generalizing decorator for Richard

cfe-lab/Kive,cfe-lab/Kive,cfe-lab/Kive,cfe-lab/Kive,cfe-lab/Kive