Added robustness for nullable params
Embedded tests