Change spec structure to hopefully make Travis work better.