Fixed some tests, formatting