Changes on the S3DR tests. Project structure changes.