Rename and fix tests that were not being executed by Maven