famousContext improvements, test improvements