Move some integration tests to unit tests

They run faster and are re-covered anyway by a more complex test