Reorganize tests into separate classes