removed sorts (they are 1 line calls anyway)
removed unneeded tests