PLA-1584

Fixed unit tests and fast unit tests
Mock or DataProvider? If the latter, I'd suggest adding it to method name