more tests. should improve coverage quite a bit.