PLAT-75 functional testing cleanup

There were a few errors and inconsistencies that cropped up during
testing. This commit addresses those.