Added tests and fallback variables