PLA-399 unit tests, and changes due to those