use local version of buddy
fix character encoding
added remaining tests