Add elif/else blocks, update test file