Added test based on user forum issue
Fixed CS