Rule fixes, unit tests
inc version