Added 6 unit tests