Fix some tests, and add compatibility layer to jobs