Make limit tests more clear
Resolve conflicts