Revert "Revert "Revert "More updates."""

This reverts commit 5677eb473dc753c7f552fa5b79f32f126837e719.
Revert "Revert "Revert "Update format of PSpec and Delta-Variance."""

This reverts commit d92919bf6dcf261532a561dcb7c1d35c2d742e9d.
Revert "Revert "Update format of PSpec and Delta-Variance.""

This reverts commit e685d284ee7604ae1109802ef27c441fc5bc63d6.
Revert "Revert "More updates.""

This reverts commit 58589e6dc15d8219b4388ef8c705a866f381bd75.
Revert "More updates."

This reverts commit 2db82ad9249a59a2a7c840f4ae969740eebc48ca.
Revert "Updates to tests."

This reverts commit d93d6985a6224e78789a038f0afcfda665230afb.