enhance tests and finder sort