WIP Added tests
Added extra doc