Adapted unit tests to new organisational format