Completed removal of RequestManager and updated test to reflect single class