Reorganizing tests, remove 'Assert.'