Raview changes: brackets, modifers + Correct data UnitTest