Changes according review notes: excesive code removed and moveTest rewritten