Fixed some tests and delinted