Fixed tests to work with all python versions again.