Refactor Skills spec to only test Skills