Flesh out the test matrix now that Travis is pretty much fixed