Enhancement #100

Make the tests works