Update and rename test~ to By