Filename update, fixed tests