Add another unit test, Rename simple2.* test files