Move a few tests, and clear out a lot of junk. original commit: 29a0c44c98d5c8d3660e4bd10eb566c7ec6e46e2