Added System Rules support
Fixed typo in CLI
Initial tests for CLI