Added some TODO relationships to the System model and updated some tests.