Adjust FileDataspaceTest to use the renamed files and classes
Make Endpoint & Engine functions static to avoid linker errors