Fixed bunch of tests, still couple left