Topics/chefspec refactoring

WIP