Moved and corrected test