Get rid of tests, for now.
Update references, fixing VS2012 bug.