cosmetics and an attempt to fix integration tests