Fixed lots of tests