Added more test units for new challenges

Added more test units for new challenges