Adding tests, refactor
refactor for request, starting ajax tests