one more test and renaming and fixing cs

                    
|Q            |A   |
|---          |--- |
|Bug fix?     |y   |
|New feature? |n   |
|BC breaks?   |n   |
|Deprecations?|n   |
|Tests pass?  |y   |
|Fixed tickets|#000|
|License      |MIT |
|Doc PR       |    |