Fix: some tests

String endings, bootstrap..