add bottlecaps along with tests