New unit and functional tests