Fixed some bugs in testing
This merge fixes some issues with testing on older python versions or older pytest versions. This will be required to run the unit tests during build on python3.4 on EL7.
This merge fixes some issues with testing on older python versions or older pytest versions. This will be required to run the unit tests during build on python3.4 on EL7.