Completed Writing Unit Tests