Added some SpecTest and fixed a couple of Spec bugs.