tests now work as well as in original