Made tests pass :-)