30.9.10.24

Rename of test class.
30.9.10.36

Removal of unnecessary code