Update: working tests 0-40