Refactoring - replaced deprecated Spec (with FunSpec)