Make sure to always reset the metaClass on cleanup
Removed unnecessary annotation
Moved tests to appropriate packages & renamed specifications to *Spec.groovy
Merge pull request #27 from iceglow/cleanup

Various test fixes.