added new testcases and changes Option to Either in function that checks what we got