Renaming systems to system to match api. More tests to put us at
100% coverage.