Scaffold Tests fixed