Adding some specs to test some of the core code before refactoring