Tests updates & implementation (2-7)