Test cleanup: extended_contract
Test cleanup: extra_features
Test cleanup: consistent indentation