Moved tests.
Account for new location.
Verbose fix.