[WIP] Added tests