Adding basic request tests and fixing one bug