Updated naming of tests