Moved and renamed test files for consistancy.