some tests renamed for names to be shorter