Some testing improvements

Still familiarizing myself with the code, making the test infrastructure work for me