Decoupling tests, removing shims, update CI