[system] fix some tests, clean up comments