Fixed tests and added support for old snapshots