More Unit Tests (and renamed some)