More tests (and bug fixed thanks to them!).