Work on incomplete test scripts
Fix Configuration7