modifying old test so they will pass with new changes...