Merge "Junit for CadiProps class"