Added explicit uniqueness setting for composite indexes; improved schema tests