Add Make support, fix bug in system defintion
Add Make tests