Organized tests into separate packages