Fix failing tests, except current bug