split out tests to see if that makes Travis any happier