Leaving one getContext and fixing tests