Cleaned up a lot of the test suite - reorganized and renamed tests. Added a new trigg...