Added more tests after review comments.