Improving tests
Adding test and including fix thanks to Philippe Ruh