Add more functional tests
Update tests
Fix error when checking for empty values
Fix error when checking for empty values