Added more areas for testing concepts