Rename test classes, add skel test classes