Added Brian's two unit tests