Fixed tests that started failing once this module was abstracted from RestfulServer