Adding Functional Tests + Responding to comments.