refactoring
added case type to dcase table
fixed test
fixed test
fixed test
fixed test