Simplifying the test_extraction code and a few clean ups

[pablohoffman]

Thanks @AlexRiina, it's definitely a good cleanup. I hope you are just setting up the environment in preparation for more contributions :)