This update is pretty much all testing and planning sessions. Also
slight organization of the testing directory.