Merge pull request #121 from jjwchoy/master

Added missing return valua check in test