Fixing Pod issue
fixing tests