add some more unit tests, coverage up to 16%