fixed tests + improved code style
improved line breaks, changed Set->OrderedSet in RDB tests