fixes for case, still not working int test-type