Added tests, to do tomorrow