Dev fix update various test cases