Finally fixing the test for all versions ?

Also discovered new issue -_-'