Added canary and suite tests