Fixed CS and add fixtures for dart imports