Added tests WIP