Improve system_tests