fixed unit tests for sentinel after file structure change

PEP8 changes
various fixes