Change-Id: I5bff0adf11bccef137d59c05edae45d774596994
Also! - adds @covers tags Change-Id: I6d4f98f75cd3c2a52c982ece6dd295a4bf84a6fa