fixed unit tests for sentinel after file structure change

PEP8 changes
various fixes
Can you add a TODO: so that it's easier to search in the future?