fix circles
fix existing tests