WIP: trying to get test_system working