Implemented some more tests, need to rewrite request tests to be independent