Added tests for additional context/info