Indu/Neha | Refactored functional FunSpec tests