More Small Changes to Interface/Tests