Snapshot class tests and refactoring.