Adding more tests and naming!