Adding in requirements and tests