partial tests cleanup & lint cleanup