Add test for users search
Some refactoring and beautification of search form