Added more working edge cases.