Small changes

Just moved more request logic to Requests module and added a couple more tests