Clean up unit tests: add shell script to run, mark current broken tests #496
Merge remote-tracking branch 'upstream/master'
polish fix for issue #494. add unit test