Cover more code with snapshot tests