Uppdated tests