Some testing improvements

Still familiarizing myself with the code, making the test infrastructure work for me
The data set must be kept.