Added tests and modified existing tests