Added 5 unit tests