PLA-1584

Fixed unit tests and fast unit tests
Would it be a good idea to move it to a getter method too?
In general, this method is hard to instrument with unit tests in it's current shape :(