Updated the undecorate! method.
Moved the undecorate! tests to their own file.