Tests changed (str to int).
Tests cleanup.