tests reviewed and renamed