Fixes for the limiter tests and a few other things