Fill in more container stuff, add test