Tried to fix limit functionality
Couple of fixes for the tests