added more hotpants variants, added testy