test dir
better math for different kinds of containers + cleanup