Update SVIs to fix return lines. Also add SVI tests.