Tests complemented to get more coverage