Added more tests + Did the extra challange