Remove ActivityContainer
Refactored test setup