Added some container setup on startup
tests improved