Removed usage of deprecated test class
Fixed CS