Adding more tests and code