Finish initial unit tests