Added lots more test locations, and improved some documentation