Updated tests a little.