Repair inability to invoke 'make roomservice_test'