Adding more tests for web fallback and fixing the bugs