Improve system tests for issues