Added about 3 tests