added additional tests and case statement