Added tests on check_limits and performed some renaming