Small name changes as well as added test12 for snapshots