Register as a decorator
Fix white space
More tests