Added 10 unit tests