Fixed test
Re-introduced some similarities with the py3k version of this