Updated tests as per timstamp server changes. Minor improvements. Updates #28.