First system test and related changes.