Further house keeping, unit tests all pass and have the correct naming.