Some testing improvements

Still familiarizing myself with the code, making the test infrastructure work for me
You must activate the env in order to use it, drop this part.