Refactor unit tests, only 4 to go....

Signed-off-by: Dale Anderson <danderson@joobworld.com>