Beef up those unit tests