better regexp and increase test cases