Added 15 new unit tests