fix tests to use updated names and paths