Add an other unit test, Rename simple2.* test files