fixes, some test cases