Fix tests again
Remove r_max and k_max from limits.txt
Rename limits.txt to constants.txt, start re-purposing