Feature/now 544

A few fixes for some of the integration tests.