SimpleAPI added to project and integration tests improved