debug data class
modify tests