Update tests for standalone context