Fixes, moves and tests

- Move Soup element to a separate file and fix tests for this change
- Minor additions to mediaocd elements