took lessons learned from the test into generic.py