Improved tests to test the new scaffold code.