Moved tests over to pytest based rather then unittest