Bring unit tests up to date

Also made some minor changes to the names of the UIView+Geometry
methods to make their intent clearer.