[fix] - unit tests pass, removed catchAllFunction because it breaks the code