added ./src from master
checkedout test changes from master