Few violations and unit tests fixes