Simplified cleaner test file.
Added WP container class so I can decouple it from the classes to write tests.