tests reorgs

Move some tests into proper slots + comments what they are.