Add test direction code, clean up