Updated tests so that they all pass with the new content