Tests work. More clean up.