Added Tests for Eli and Zac