More Circuit features and test cases