Separate build and check step, #10