more tests, better var names