Split tests into separate classes