Unit test and fixed simple violations.
Unit tests