Better system test