fixing tests, and rename old tests. Need to increase coverage.