Updated tests with more cases