Fixing up naming.  Adding test.