Add a couple of tests
PEP8 related conflicts