Add a general resource object
Fix multistage JSON tests
Remove s2_tube as it's not needed
Merge branch 'add_spin_column'