Final change to keep Travis happy, specify excepts