Fix a major bug (missing argument for constructor)
Add tests