Rename and fix tests that were not being executed by Maven
(cherry picked from commit 56960758cd42419cac3958371af206939ed40a14)
Rename and fix tests that were not being executed by Maven (fix for 6.0.x branch)