Preparing for pull from server
Fixed for merging with master
Changed tests to be compatible with updated ADT