[#869] Renamed some setting variables and added some tests.