Some micor changes and a test case