fix tests and tabs