simplify tests and deps