update tests
remove need for itertools
no magical constants in tests
Merge branch 'develop'