Merge "Add tests for SystemProperties.java"