Expand unit tests, coverage now to 56.9%