Revert "Renamed some classed and improved test."

This reverts commit 186b49ccdecab5a345a11869aa01b7fda1436eb6.