Fix tests for lower than 2.3
Fix tests regarding empty values