BUGFIX: Fix ailing tests