refactor tests to accept new names