Make tests also working for me ;).