I have 1 neon tetra and 2 white skirt tetras.?

Currently their in a 5 gallon tank, but I'm getting a 10 gallon soon. What other kinds of fish can I put in with them, and how many in a 10 gallon tank?