Use standard annotations

Also moves container to be a test dependency.