Added in Canary Functional Tests