removed initial commit
fixed typo
replaced gen functions with new ones from tests.py, wired it all up