Updated tests a bit