Updated tests so they all work.