some minor modificiations for test