Try and fix context test
Fix #1