Refactored requesting
More unit test coverage => also bug fixing