Clean up.
Added tests via console.