Fixed missing test, fixed missing file