Adding a few tests and get things done with Python3.