drop registrations that hit _maxserve, and fix tests to run properly
- the old behaviour was based on an incorrect understanding of the previous iteration of the code