Fix username from the test merge