Improving/Expanding Functional Tests