Added requirements and fix tests