Fix registry testing, remove dependency of master to enable both foss an...