Add more context tests