Removed trash
Renamed test classes
Restructured tests for WordDAO