Cleaned up RequestTest file for unit tests