minor improvements related with testing