Exceptions cleanup
Improve rules load specification
Tests cleanup