Tried refactoring SnapTest further, bugs
Refactoring