Added tests for structure-api (more needed).