Add extra bonus tests