Decorators work, better tests