Added proper if/else if/else blocks, where else if/else are optional

Added test file for if blocks. Committing files needed for testing
of previous funcCall commit