Adhere to new easier pstest usage