Fixed a bunch of test