Add test for GLM with three conditions
Make categories and contrast fns more flexible