Fixed test cs, improved readability