Tests update 1-4