Rewrite tests to use decorator instead, it's a bit cleaner