Finished converting decorator tests