Updated tests with changes added in latests commits