Rename test file to better match other names
Small style tweak in atomic role
Tidy test code