cleaned up test cases to not have lines too long
updated watchfile to run appdb tests correctly
updated datastore server and its tests to use newly renamed zookeeper methods