Fix the add context button to be unique, add more tests