more test variables and cleaner handling