Revert "scaffloding tests"

This reverts commit 2728ea0edd155c31383a405db4044abc93641cf3.