Excluding the time and correcting tests