Updated RequestParser, added unit tests