LPS-33313 fix test so it works again
LPS-33313 refactor to junit4 format
LPS-33313 refactor to junit4 format
LPS-33313 Source formatting