clean up tests making use of let and before