Fixes tests with proper naming.