Now with a working test