Tidying; remove hard-coded test location.