Added tests etc.