3. with fixed code and more test chases