Added more unit tests. All pass.