fix integration tests, added one for Issue 304