Bug fixes

I wish running the tests was as simple as `nosetests` :sparkles:  or `pytest` :sparkling_heart: