Fix util function for options merging so that it allows values == 0
add a test
Modify tests to use testing framework
Test when first parameter is null