Added test cases as suggested by AndrejMitrovic