Updated: Test autogeneration