Added integration tests for #265