Moved test classes back to the standard source set.

The separation I wanted just isn't worth it.