Fixed missing return value causing compile warnings
Fixed linux build issues with unit test form