Add couple more unit tests