Updated TODO
Added first server side test, experimenting with test layout. Happy so far, we will see though