Fixes issue #489
Fix reverences after test renames.