More unit and functional tests added