Add SVG tests. Restructure a bit.