Oliver, please merge my tests directory into your package