CLEREZZA-911 Fixed. Test improved.
CLEREZZA-912 Implemented