cosmetic tweak
added more tests