Rename test, add missing attributes