Adapted the unit test to the new folders.