Improve init test cases