Updated tests accordingly.