Updated tests due to changes in the rest of the code