Removes unused classes, pushed assertions to soap test step and refactored toString methods for better readability