STY: flake8
Addressing @antgonza's comments
TST: removing test failures due to hard coded IDs
Adjusting test schema