LPS-32370
LPS-32370 Move tests
Source formatter had trailing blank line
LPS-32370 Update dir
LPS-32349 Revert for now