Progress on simple unit tests...