don't keep reference to empty parameters
use ConcurrentHashMap
let test classes be serializable