Put all integration specs in the same place

Also name the files more clearly.