Writing specs, cleaning up CI