Improve functional specs setup