Additional mock ajax refactoring, more variety