include fixes from master and rename test file