Overhaul and mor tests