WIP: Beef up those unit tests