Tests changed to acommodate new changes