Adapted rebookable slots function for the test interface, more code deletion