Break unit tests up into classes