Revert "Rename `_test` to `test`"

This reverts commit e424a093760ce62360081d08f9765239cd494ddb.

The 'elasticity' branch was unintentionally merged into the master branch. Revert back to branch before merge.