LPS-44347 SF

Hey Manu, please review the first commit with the tests. I've already reviewed the rest. /cc @migue. I find the pattern he uses of calling test method from other test methods troublesome, but maybe it's common place and I just don't know. What do you guys think?