[BUGFIX] Fixed a few, but not all, tests