Added more tests (coverage now almost 60%).