sorry for direct master commit, removed test dir