refactored tests, due to changes in upstream