Merged and resolved conflicts.
[situare] / tests /
drwxr-xr-x   ..
drwxr-xr-x - testmap
drwxr-xr-x - ui