Add and rename tests
Add new tests and rename some