Fix some tests and mark others as boken