Proper fix tests