Fixed and reenabled tests