Test cleanup: use then-when-given in unit test names