rename some block test classes to ensure they don't conflict