#5 major changes and new test scope.