Name refactoring, more test skeletons. Next, flesh on the skeletors