typos and moving tests around