Add wrong filename fixture and begin refactor to error handling