Adding new tests by Noha