Refactore the unit tests (kick all the old ones)