Test improvements.
Spec tests passing, Purge almost working.