- Added extra contexts for base tests
- Removed some unnecessary templates