Hey Andrea, I know what it feels like to have a 7mm stone. I passed mine with no lith two years ago and it sure hurt...
Regarding the calcium suplements, if I were you I'd wait until the result of the tests. Not all the stones are calcium oxalates therefore if, for instance, you have uric acid stones, you can take all the calcium you want without forming stones.
Relax, drink plenty of water and don't think about stones.

Are you still in pain? I remember that when I passed my "big" stone, my kidney has been sore for a long, long time. No pain, but a constant discomfort. I think it's pretty natural, after all you had a foreign guest for quite a long time...
PS: Are we two the only ones posting regularly?
Carla