Snapshot - about to get tests working again