More testing
Merge pull request #1030 from xoppa/3dapi

More testing