Removed last two functional tests parts