Some scaffold tests

Previously: #411