Finally version
tests added