Rename share test classes and several small fixies