Minor bug fixes + aliases for test failover cleanup options for easier SRM integration