Put tester in top dir
merged