Preliminary work on Server browser. Remove test datasource