Fix limit and add tests
v0.0.27182122