bumped versions and refactored tests