Updated PyTest

Functionally it is the same. However, instead of testing across 6 tests
for the same function, all tests have been combined into one.