Resolved a few tests