Issue #234 Fix tests to pull up with master updates

Issue #234 
@omar-kassem please review to merge with master