New test cases for demo, adjusted SYSTEM_SPACE