Fixing tests once and for all