Refactored "system" spec