Add unit tests. +Trivial renaming.