Removed unnecessary attributes and methods
Test fixed