#26: fix tests
Fixes #81: Change container with the last