First Pass at adding unit tests