Day 9: Some improvements to funcional tests